6d6417
@@ -2381,12 +2381,6 @@
public class AssignmentManager extends ZooKeeperListener {
    * @throws IOException
    */
   public void assignAllUserRegions() throws IOException, InterruptedException {
-    // Get all available servers
-    List<ServerName> destServers = serverManager.createDestinationServersList();
-
-    // If there are no servers we need not proceed with region assignment.
-    if (destServers.isEmpty()) return;
-
     // Skip assignment for regions of tables in DISABLING state because during clean cluster startup
     // no RS is alive and regions map also doesn't have any information about the regions.
     // See HBASE-6281. 
@@ -2397,6 +2391,12 @@
public class AssignmentManager extends ZooKeeperListener {
         disablingAndDisabledTables, true);
     if (allRegions == null || allRegions.isEmpty()) return;
 
+    // Get all available servers
+    List<ServerName> destServers = serverManager.createDestinationServersList();
+
+    // If there are no servers we need not proceed with region assignment.
+    if (destServers.isEmpty()) return;
+
     // Determine what type of assignment to do on startup
     boolean retainAssignment = master.getConfiguration().
       getBoolean("hbase.master.startup.retainassign", true);
